Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 17 May 2010 12:37:57 +0000 (12:37 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 17 May 2010 12:37:57 +0000 (12:37 +0000)

Trivial merge